From: Jim Blandy <jimb@redhat.com>
Date: Tue, 22 Jun 1993 03:44:28 +0000 (+0000)
Subject: * xrdb.c (get_user_db): Remember to free the screen-local resource
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~95187
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=fdce0b3948b9e212a9af63c4c8587fcad44fda30;p=emacs.git

* xrdb.c (get_user_db): Remember to free the screen-local resource
	string after we've merged its data into db.
---

diff --git a/src/xrdb.c b/src/xrdb.c
index 6a769e3aa6c..f7825a4a60f 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -319,7 +319,10 @@ get_user_db (display)
   /* Get the screen-specific resources too.  */
   xdefs = XScreenResourceString (DefaultScreenOfDisplay (display));
   if (xdefs != NULL)
-    XrmMergeDatabases (XrmGetStringDatabase (xdefs), &db);
+    {
+      XrmMergeDatabases (XrmGetStringDatabase (xdefs), &db);
+      XFree (xdefs);
+    }
 #endif
 #endif